Skip to content

net/http/httputil: fix leaks and data loss in ReverseProxy protocol upgrade - #80924

Open
wentaoxu-boop wants to merge 1 commit into
golang:masterfrom
wentaoxu-boop:fix-reverseproxy-upgrade
Open

net/http/httputil: fix leaks and data loss in ReverseProxy protocol upgrade#80924
wentaoxu-boop wants to merge 1 commit into
golang:masterfrom
wentaoxu-boop:fix-reverseproxy-upgrade

Conversation

@wentaoxu-boop

Copy link
Copy Markdown

In handleUpgradeResponse:

  • Close res.Body on early validation errors and when hijacking fails to
    prevent leaking backend connections and file descriptors.
  • Strip hop-by-hop headers from backend 101 Switching Protocols
    responses while preserving Connection and Upgrade headers.
  • Read from the Hijacker's bufio.Reader when copying data to the
    backend to avoid losing client data buffered during or immediately
    after the handshake.
  • Increase error channel buffer capacity to 2 to ensure neither copy
    goroutine blocks on channel send when exiting early on error.

Fixes #80875

…pgrade

In handleUpgradeResponse:
- Close res.Body on early validation errors and when hijacking fails to
  prevent leaking backend connections and file descriptors.
- Strip hop-by-hop headers from backend 101 Switching Protocols
  responses while preserving Connection and Upgrade headers.
- Read from the Hijacker's bufio.Reader when copying data to the
  backend to avoid losing client data buffered during or immediately
  after the handshake.
- Increase error channel buffer capacity to 2 to ensure neither copy
  goroutine blocks on channel send when exiting early on error.

Fixes golang#80875
@gopherbot

Copy link
Copy Markdown
Contributor

This PR (HEAD: 7fa5d2c) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/go/+/816640.

Important tips:

  • Don't comment on this PR. All discussion takes place in Gerrit.
  • You need a Gmail or other Google account to log in to Gerrit.
  • To change your code in response to feedback:
    • Push a new commit to the branch used by your GitHub PR.
    • A new "patch set" will then appear in Gerrit.
    • Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
    • Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
    • Multiple commits in the PR will be squashed by GerritBot.
  • The title and description of the GitHub PR are used to construct the final commit message.
    • Edit these as needed via the GitHub web interface (not via Gerrit or git).
    • You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
  • See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

@gopherbot

Copy link
Copy Markdown
Contributor

Message from Gopher Robot:

Patch Set 1:

Congratulations on opening your first change. Thank you for your contribution!

Next steps:
A maintainer will review your change and provide feedback. See
https://go.dev/doc/contribute#review for more info and tips to get your
patch through code review.

Most changes in the Go project go through a few rounds of revision. This can be
surprising to people new to the project. The careful, iterative review process
is our way of helping mentor contributors and ensuring that their contributions
have a lasting impact.

During May-July and Nov-Jan the Go project is in a code freeze, during which
little code gets reviewed or merged. If a reviewer responds with a comment like
R=go1.11 or adds a tag like "wait-release", it means that this CL will be
reviewed as part of the next development cycle. See https://go.dev/s/release
for more details.


Please don’t reply on this GitHub thread. Visit golang.org/cl/816640.
After addressing review feedback, remember to publish your drafts!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

net/http/httputil: ReverseProxy.handleUpgradeResponse has FD leaks on validation failure, data loss from bufio.Reader, and leaks hop-by-hop headers

2 participants